Remove __TEST_HARNESS__ tests from x86_emulate: instead check for __XEN__

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/tests/Makefile b/tools/tests/Makefile
index afa6578619c35cfeb31fb3f0e8c00e11b67b1669..263caffb46f9404bb78cc117554b120e05cabb57 100644 (file)
--- a/tools/tests/Makefile
+++ b/tools/tests/Makefile
@@ -4,8 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET := test_x86_emulator
 
-HOSTCFLAGS += -D__TEST_HARNESS__
-
 .PHONY: all
 all: $(TARGET)
 

diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c
index 7c28dd87b9b6fb9f299069d392d6154829505fc5..d13eb5689fd35d9b45362826b1caf85dd2d41923 100644 (file)
--- a/xen/arch/x86/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2005 Keir Fraser
  */
 
-#ifdef __TEST_HARNESS__
+#ifndef __XEN__
 #include <stdio.h>
 #include <stdint.h>
 #include <public/xen.h>
@@ -1127,7 +1127,7 @@ x86_emulate_memop(
     return -1;
 }
 
-#ifndef __TEST_HARNESS__
+#ifdef __XEN__
 
 #include <asm/mm.h>
 #include <asm/uaccess.h>